summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-04-06 17:25:09 +0200
committerOlivier Goffart <olivier.goffart@nokia.com>2011-04-13 14:09:02 +0200
commit9b5b3f22b405f3ca5d71b7cef39bcc91c25acd10 (patch)
treeb801bd3e99dc0f1fcd8c6960d6aa43729dbdfa63
parentb3f26c5debfa5f38972aea4fce3ba11d509436d2 (diff)
Define the QT_NO_XXXX when required
Task-number: QTMODULARIZATION-38
-rw-r--r--afterlive/qtdeclarative/0002-Define-the-QT_NO_.-when-the-module-is-absant-from-QT.patch24
-rw-r--r--afterlive/qtdoc/0001-Define-the-QT_NO_.-when-the-module-is-absant-from-QT.patch26
-rw-r--r--afterlive/qtscript/0002-Define-the-QT_NO_.-when-the-module-is-absant-from-QT.patch23
3 files changed, 73 insertions, 0 deletions
diff --git a/afterlive/qtdeclarative/0002-Define-the-QT_NO_.-when-the-module-is-absant-from-QT.patch b/afterlive/qtdeclarative/0002-Define-the-QT_NO_.-when-the-module-is-absant-from-QT.patch
new file mode 100644
index 0000000..11796ca
--- /dev/null
+++ b/afterlive/qtdeclarative/0002-Define-the-QT_NO_.-when-the-module-is-absant-from-QT.patch
@@ -0,0 +1,24 @@
+From ba034bfc7995bf852299cbdcf2fc6c2c9f0bf0af Mon Sep 17 00:00:00 2001
+From: Olivier Goffart <olivier.goffart@nokia.com>
+Date: Wed, 6 Apr 2011 15:33:13 +0200
+Subject: [PATCH 1/3] Define the QT_NO_.... when the module is absant from QT_CONFIG
+
+Task-number: QTMODULARIZATION-38
+---
+ src/declarative/util/util.pri | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
+index 62fa8f1..5bc8b11 100644
+--- a/src/declarative/util/util.pri
++++ b/src/declarative/util/util.pri
+@@ -69,4 +69,6 @@ contains(QT_CONFIG, xmlpatterns) {
+ QT+=xmlpatterns
+ SOURCES += $$PWD/qdeclarativexmllistmodel.cpp
+ HEADERS += $$PWD/qdeclarativexmllistmodel_p.h
++} else {
++ DEFINES += QT_NO_XMLPATTERNS
+ }
+--
+1.7.4.3
+
diff --git a/afterlive/qtdoc/0001-Define-the-QT_NO_.-when-the-module-is-absant-from-QT.patch b/afterlive/qtdoc/0001-Define-the-QT_NO_.-when-the-module-is-absant-from-QT.patch
new file mode 100644
index 0000000..93d9975
--- /dev/null
+++ b/afterlive/qtdoc/0001-Define-the-QT_NO_.-when-the-module-is-absant-from-QT.patch
@@ -0,0 +1,26 @@
+From 883e2e012945247f673e817c4ae473692a576964 Mon Sep 17 00:00:00 2001
+From: Olivier Goffart <olivier.goffart@nokia.com>
+Date: Wed, 6 Apr 2011 15:33:13 +0200
+Subject: [PATCH 1/3] Define the QT_NO_.... when the module is absant from QT_CONFIG
+
+Task-number: QTMODULARIZATION-38
+---
+ demos/qtdemo/qtdemo.pro | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro
+index b02cdfa..7cbe8ff 100644
+--- a/demos/qtdemo/qtdemo.pro
++++ b/demos/qtdemo/qtdemo.pro
+@@ -15,6 +15,8 @@ contains(QT_CONFIG, opengl) {
+
+ contains(QT_CONFIG, declarative) {
+ QT += declarative
++} else {
++ DEFINES *= QT_NO_DECLARATIVE
+ }
+
+ build_all:!build_pass {
+--
+1.7.4.3
+
diff --git a/afterlive/qtscript/0002-Define-the-QT_NO_.-when-the-module-is-absant-from-QT.patch b/afterlive/qtscript/0002-Define-the-QT_NO_.-when-the-module-is-absant-from-QT.patch
new file mode 100644
index 0000000..846ff21
--- /dev/null
+++ b/afterlive/qtscript/0002-Define-the-QT_NO_.-when-the-module-is-absant-from-QT.patch
@@ -0,0 +1,23 @@
+From 836be71cc41314f1c5e0625dec9c72e0f02d45e6 Mon Sep 17 00:00:00 2001
+From: Olivier Goffart <olivier.goffart@nokia.com>
+Date: Wed, 6 Apr 2011 15:33:13 +0200
+Subject: [PATCH 1/3] Define the QT_NO_.... when the module is absant from QT_CONFIG
+
+Task-number: QTMODULARIZATION-38
+---
+ src/scripttools/debugging/debugging.pri | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/scripttools/debugging/debugging.pri b/src/scripttools/debugging/debugging.pri
+index 2082fd0..b7e8a95 100644
+--- a/src/scripttools/debugging/debugging.pri
++++ b/src/scripttools/debugging/debugging.pri
+@@ -157,3 +157,5 @@ SOURCES += \
+
+ HEADERS += \
+ $$PWD/qscriptenginedebugger.h
++
++!contains(QT_CONFIG, svg) DEFINES *= QT_NO_SVG
+--
+1.7.4.3
+